Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Sat, 3 Dec 2005 12:21:52 +0000 (12:21 +0000)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Sat, 3 Dec 2005 12:21:52 +0000 (12:21 +0000)

Trivial merge